Skip to content

Conversation

@Muscraft
Copy link
Member

@Muscraft Muscraft commented Oct 22, 2025

This PR updates annotate-snippets to the latest version and updates the adapter code1 so that AnnotateSnippetEmitter's output matches HumanEmitter's output. If anyone would like to see the differences2 between AnnotateSnippetEmitter and HumanEmitter, I have a branch where AnnotateSnippetEmitter is used in place of HumanEmitter.

Footnotes

  1. A lot of the adapter code changes are based on code for HumanEmitter.

  2. Some of the test differences will go away when fix: Don't add diff symbol to unchanged lines #148001 and fix: Only special case single line item attribute suggestions #148004 are merged.

@rustbot
Copy link
Collaborator

rustbot commented Oct 22, 2025

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 22, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 22, 2025

r? @jdonszelmann

rustbot has assigned @jdonszelmann.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Oct 24, 2025

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@jdonszelmann
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 25, 2025

📌 Commit 354b977 has been approved by jdonszelmann

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2025
bors added a commit that referenced this pull request Oct 25, 2025
Rollup of 4 pull requests

Successful merges:

 - #143361 (Stop passing resolver disambiguator state to AST lowering.)
 - #148000 (Improvements to attribute suggestions)
 - #148007 (chore: Update to the latest annotate-snippets)
 - #148088 (compiletest: Simplify passing arguments to spawned test threads)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Oct 25, 2025
Rollup of 4 pull requests

Successful merges:

 - #143361 (Stop passing resolver disambiguator state to AST lowering.)
 - #148000 (Improvements to attribute suggestions)
 - #148007 (chore: Update to the latest annotate-snippets)
 - #148088 (compiletest: Simplify passing arguments to spawned test threads)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 141c910 into rust-lang:master Oct 25, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Oct 25, 2025
rust-timer added a commit that referenced this pull request Oct 25, 2025
Rollup merge of #148007 - Muscraft:annotate-snippets, r=jdonszelmann

chore: Update to the latest annotate-snippets

This PR updates `annotate-snippets` to the latest version and updates the adapter code[^1] so that `AnnotateSnippetEmitter`'s output matches `HumanEmitter`'s output. If anyone would like to see the differences[^2] between `AnnotateSnippetEmitter` and `HumanEmitter`, [I have a branch](https://github.com/Muscraft/rust/tree/annotate-snippets-default-renderer) where `AnnotateSnippetEmitter` is used in place of `HumanEmitter`.

[^1]: A lot of the adapter code changes are based on code for `HumanEmitter`.
[^2]: Some of the test differences will go away when #148001 and #148004 are merged.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants